Manually merged changes with John's GM

As described in title.