merge branch 6.x smithsonian code review to Smithsonian