7.x merge nigel