Core 5202

These are my changes for CORE-5202.