Change format bit back to 2
Merge branch 'devel'