Changes ported to 7_1_0_pre5