Merge "[Context] Modified default result size"