Merge changes I3eb51b64,Id7b0213e