fix assests generation
Merge branch 'master' into 2.2

* master:
  fix assests generation