OZP-73 making changes to be consistent with changes on this branch in the commons repo