[Coselmar-commits] 03/05: merge changes from develop