Code cleaning
Merge branch 'asset' into user