Release v0.11 merge