this follows up on HHH-11199 Open , HHH-11199 Open backports some test fixes from master to 5.0 + two new fixes from this jira