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