Merge "Refactor the VDM / GWPC callbacks." into main