[RVM-630] - JIRA