last stable change from version2.1