WPHRT-58 Commit message 2