CORE-5773: more bug eradication