Merge branch 'js/maint-graft-unhide-true-parents'