CONTRIB-4253
CONTRIB-4216 and CONTRIB-4253