Changes to this file are the ones that are superseded by #4536