Merge branch 'se/rev-parse' into next