Edit 'default_icon'
Merge branch 'my-feature-branch'