Fixes JIRA 46
In-progess on JIRA 24,45,47,49