Merge branch 'mg/rev-parse-tests'