Pushing in the final changes for v2.3