Merge branch 'ss/check-builtins-on-windows'