Epic: WPHRT-61 >> Story: WPHRT-62 >> Task: WPHRT-65; New commit message 2.