PW-13549 fixes round 3
round 4