Merge "Add apex availability for apex name change am: ad6d18c5f3" into main-kernel