Merge branch 'kb/ancestry-path-threedots' into maint