reorder checks
Merge branch 'master' into identifiers