Merge branches 'seo_consider' and 'manual_scope' into tmp