Merge qnd v0.0.11