Resolve #3588803 "Upgrade to astro"

Tim Plunkettrequested to merge
issue/canvas-3588803:3588803-upgrade-to-astro into 1.x

[Description of changes]

Testing instructions

  • First step for someone to test the changes in this MR

Closes #3588803

Merge request reports