Changes made after the revert, on the feature_branch

Pull request after the revert.