More 1.5 changes.

(cherry picked from commit 087348c2c70abaa50f119d608b19d13210bcc3c0)