Polish SPR-12286

Issue: SPR-12286