Pull alexey-fixes into release branch