OC-2746: Changes from comments in PR#361