P2 release 154 bugid 99439

99439 again