Merge branch 'sb/t3600-cleanup' into maint