WPHRT-58 commit messgae