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