Merge "Fix wrong initial staged split position" into tm-dev