porting `format none` from v10 to v11
Merge branch 'format_none' into sonots_v11