Fixed #2636.
Fixed #2636.
Merge branch 'master' into foundation5-update-redux-2298