Merge remote-tracking branch 'origin/feature/PRXS-2909-DeleteDeprecatedFieldsRule' into feature/PRXS-2909-DeleteDeprecatedFieldsRule