DEVELOPER-842 temporary upgrade to my aweplug branch