Merge pull request #1303 from john-hill/PLFM-1655

test stablization
wait should be in a loop