[ORB-604] un-reverted previous commits resulting in accidental commit by Steve