Co-authored-by: Bartek Wajda <bartlomiej.wajda@ibexa.co>
(cherry picked from commit b496f073c3f03707d3531a6941dc098b84e3cbed)