Update 4_7_x with 4_6_0 beta and docs changes