Diff module upgrade and remove breaking patches for various other modules (#3620581)