Inprogress on JIRA 50