pre-release merges