Branch point for 4.9-p-release