Merge BC's changes into 4_8_x