Fix uncaught error on IE8
Merge remote-tracking branch 'origin/2.5-March-23' into 2.5-March-23