(cherry picked from commit a62f87c8) Co-authored-by: Vojtěch Kůr <vojtech.kur@gmail.com>
mentioned in commit 9a98e50d