[2919] Update to changes of cmangos [12536]