Merge "Add helpers for populating apex module info" into main