Extract external subs from container before determining characterset Original-merge: 1faee43b11 Merged-by: Bond-009 <bond.009@outlook.com> Backported-by: Joshua Boniface <joshua@boniface.me>
1faee43b11