Merge branch 'fix/formatter' into 'develop'