adding in config for three yaml props
Merge branch '1.2'