Merge branch 'master' into salsubaiee/master_fix_asterix_issue_460