alpha_3.7_features

Alpha 3.7 patch