[Wao-commits] 11/11: Merge branch 'feature/6452' into develop