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