Fixed missing block asset
Merged assethelper changes