APEX-PDP S3P changes for Jakarta