Merge branch 'rs/unify-is-branch' into next