Fix commit to issue association (Jira)
Fix imports
Merge origin/master