Added extra checks for ext storage class (Backport to stable5)

Backport of #7305 to stable5