Fixing TOOLS 2555 for 3.7.1. release