integrating commits from newlayout branch