Syncing code with launchpad (rev 3253..3256 and rev 3257..3263).