Ensuring debugging does not affect validating
Merge remote-tracking branch 'upstream3/master'