Add a few checks
Merge commit 'd421b2826dc4a63c170962b2bd4bf493f7ed2ce3' into 2.0