fix merge of sts-dev-team system/core