Merged 0.51.1 branch