* Manually Merged in 0.92 branch due to repository conversion issues.