Update patches after review of 407059