Merged branch 0.11.9 into 0.12.0