v1.0.9rc1: Fixed issue CONTRIB-4321