NO-JIRA:Merging jobara's changes.