What does this MR do?
Fixes a regression introduced while switching to
Why was this MR needed?
Pleas read #2276 (closed) for a reference.
Are there points in the code the reviewer needs to double check?
Does this MR meet the acceptance criteria?
Added for this feature/bug
All builds are passing
Branch has no merge conflicts with
master(if you do - rebase it please)
What are the relevant issue numbers?
Fixes #2276 (closed)