Merge branch 'ma/split-symref-update-fix'