[RVM-549] - JIRA