Merge branch 'jc/decorate-leaky-separator-color' into maint