This MR contains conservative pin upgrades. !326 (merged) will be rebased with respect to this.
It contains: