At least some of those bugs seem present in ORM 5.x. Postponing the workaround removal to Search 7.0, when we’ll drop support for ORM 5.x.