Merge changes If75e58ba,I48f074cd