OC-5990
commiting more changes and fixes to this issue