merge upgrade into main codebase