Merge "Use explicit requirements from APEX" into main