Merge branch 'fc/rev-parse-test-updates'