Manually updated branch to LayoutEdits branch