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