Changes made after the revert, on the feature_branch