Making 2.2.0 rc4 build