Branch 0.11 Refresh from Apache