[Coselmar-commits] 02/06: Merge branch 'develop' into feature/6435-modify-document