Merge changes I6244de55,I20d073c2 into topic/schema