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