HHH-7889

Pull request for HHH-7889.