Merge "Updates to preferences"