<format>: Merge merging_format
into feature/format
#1833
Merged
merging_format
into feature/format
#1833