Merge "Do not use hard-coded apex name" into main