SES-1952 : Also port fix to non-compliance mode