Merges 0.10.x-support branch