WL#5154 needs to be ported to next-mr and 6.0 separately. That can not be done in scope of this merge due to numerous test failures.
