Merge "Fix incorrect external resource creation"