Developer2: will attempt to merge master into acceptance