Merge "Move sysconfig required to APEX" into main