Re: Recent updates to 2.x