Merge branch 'improve-formatter' into 'develop'