Integrates changes for TMDM-7455 within TMDM-7499 changes.