Merge branch 4.5 into 4.6