DON'T MERGE: These are the diversion between our version

Have you deprecated some of these classes?