Merge branch 'jk/shallow-update-fix' into maint