all === checks removed
Merge remote-tracking branch 'origin/performanceTweaks'