Merge "Links update class cleanups"