Deals with corefreferenceChains not being available
Merge remote-tracking branch 'origin/dev' into dev2