1237 assets combination

Fixes #1237 

/me thinks