Merge changes from topic 'ofj-models-to-ofp-models'