Add in Various patches to bring in line with 7.1, and some newer patches