This will be useful also when migrating from V7/V8 to V22+

This will be useful also when migrating from V7/V8 to V22+