Can disable asset host with an ENV variable
Merge remote-tracking branch 'stage/master'