Merge "replace sleep wait into property wait"