Updated a few instances that should have been contained in the Core Package.
Authored by: emlarsson 2021-05-31
Parent: [r6599]
Child: [r6601]
