Merge branch 'move_buttons_to_content_area' into new_panels_with_context_buttons