Ticket22397

**WIP, not ready for merge.**