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

BS3 commits: 2b302f69eea416bc85e7827b7d7a74d49f879662