Merge "Revert "Exclude setting code maps from APEX"" into main