merge in master-release history after reset to 8b8f98b68792a4b5c1650d67d0aa953a7f10aab0