OC-6048
more changes checking in