Merge "Move APEX symlink creation to alternative module"