RELEASE 2.4 - Release Engineering on master adjust to 2.5