Merged in filling in layout branch.