Merge 3744
Try to fix pipeline for this branch (does not work in original MR !50 (closed)).
TODO: Check whether to merge this one or !51 (closed).
Try to fix pipeline for this branch (does not work in original MR !50 (closed)).
TODO: Check whether to merge this one or !51 (closed).