Strict Validation b089df5

you may only want to cherry pick b089df5