Decided to make this a v 2.3 release