PW-13549 fixes round 2