Change format to the presets
Merge origin/master