Fixing issue with the cmv3 branch merged (again)