Developer2: will attempt to merge master into acceptance
Developer2: Got some changes from acceptance and master