Merge branch 'mk/maint-graph-infinity-loop' into maint