Aligned with latest updates to Jekyll variant.