Original MR: !922 (merged) Needs !920 (merged) to compile successful as it was done on top of that MR.