merge in master-release history after reset to d763fc7822e7ab1eb593d479c0354a6bcdb6f09f