Ver1.3.6 Beta commit