Merge branches 'manual_scope' and 'seo_consider' into tmp