Merge "Add version number to deprecated setting"