I think these other changes need to be in a pull request merging into master and we just back port them to 1.9 and 1.10. In theory lets make this validation as a fix in master