Merge part of branch 'for-next.instantiate' into for-next


Author Andreas Gruenbacher Date Commit Parent 44dab005
Diff has more than 3000 files, too many to show.