Merge "Refactor a little bit and do the validation on also default.prop."