Merge branch 'frameless_w_fixed_header-div'