Merge branch 'ConstStr_Access_Checks' into 'master'