Merging 17846:17904 from trunk.