Various: update to Aurora 21