Merge branch '2678_resize_layout_fix'