pre-release merge