CONTRIB-5302 CONTRIB-5303 and codechecker fixes