Delaying merging assets as long as possible avoids introducing incorrect relative orderings that cause a broken final result. Backport of 959d0c078a from master.
959d0c078a