OZP-16: replaces changes that were rolled back in master and picked up on a merge.