WPHRT-58 Commit message 3