Merge branch 'js/color-on-windows-comment' into maint