Merge "Avoid dependency cycle from apexer to apexer" into main