Merging rc4 to master