Merge tag 'v1' into develop

v1

* tag 'v1':
Change assets settings
Merge branch 'release/v1.1'

* release/v1.1:
  Change assets settings