OC-11140 nested values support