Merge branch 'master' into explicit_case_processing