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