Merge "Deprecate FEATURE_PROGRESS and related methods"