Update dependencies to 4.2, maybe put in a new branch?