7.x nigel merge