Merge "New optimized cluster deploy job:"