(cherry picked from commit dccf8c5f27ed4a1af47f1fc052e9ac206f3a61b7) Signed-off-by: Domen Kožar <domen@dev.si>