merge in master-release history after reset to 2e17ac46c8ce8195155475d123d59e85ff912a18