Merge branch 'feature'
Merge remote-tracking branch 'origin/feature'
Ignore UI images
Merge remote-tracking branch 'origin/feature'
Merge remote-tracking branch 'origin/feature'
Merge remote-tracking branch 'origin/master' into feature