Change Details

Partial fix, remaining issues: {F23490} {F23488}