OC-11669 and OC-11670 bugfixes