Code

changelog: Squeeze backport.