[Wao-commits] branch feature/6392 created (now ecc4187)