merge in master-release history after reset to f4191b59196237680f3ebc8fc2af62b36d9c25f9