Merge branch 'master' into salsubaiee/master_issue_596