some changes from #13801 - add strict mode back and ==