Merge branch 'master' into salsubaiee/master_fix_issue_509