Merge branch 'kb/ancestry-path-threedots'