Merge RC2 pre release into 7.x-1.x