Merge "Exclude setting code maps from APEX" into main