Merge changes If7159c39,I6c84b2fe