Merge "Add new config option to globally trigger resource validation"