merge in master-release history after reset to 4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e