PMO-2838: improved validation
PMO-2838: finished validation
Merge branch 'master' into 1.9.x
Use core v1.9.12 with completed validation support for PMO-2838
v1.9.13 completes validation logic for PMO-2838