Fix merge error in previous commit

Issue: SPR-11385