Making a collection compatible with core 2.19 and templating changes

fwiw I’ve been keeping this post updated with PRs related to core-2.19.