Upgrade to Serenity-core 1.0.21