WPHRT-58 push changes