Merge "IP class cleanups"