fix for 23261 & 23527
Merge branch 'master' of ssh://sourcecontrol.masterofcode.com:2222/root/preflightrisk