Add final modifier to preferences.
Merge branch 'origin/master'