Merge "Make more preference copyable"