Work in progress

Issue: SPR-11982