This breaks support with old versions from <=2019 Change-Id: Ie56e3db19dd73dfd7668c373caaeaac60e708c9c