Merge: rev75 (Making changes to settings for backwards compatibility with UfA.)