merge in master-release history after reset to 250b336c2b1dda1df2c54f959f8172ecb6b27203