From 56ccbbb14d95fc22d04dae3f4e33d36f2303758b Mon Sep 17 00:00:00 2001
From: Luca Deri <lucaderi@users.noreply.github.com>
Date: Sun, 23 Aug 2020 14:15:07 +0200
Subject: [PATCH] Cherry pick of PR 373