merge in master-release history after reset to 8137ef0e39425f11afa38330d37c84f8c7bc0bea