OC-7484, OC-7425: Merge Sprint 80 fixes