Merge branch 'uk/rev-parse-parse-opt' into next