Merge branch 'whx'

Change-Id: I0f9238dadea932a349515afc837946586dd57805