Prepared branch for next development version: 2.3