merged 2.3.1-dev