Alignment with 0.11.0