Fix Catalyst Base edition patch

Change-Id: I959c0d44b3c2bb14f086334bdb3da2ce76f55dc2
Merge topic '14274-fixup-catalyst' into next

101a315 Fix Catalyst Base edition patch