Merge changes I4fd0f119,Ie3aa6347 into v2.0