Finalising before release 2.3