Merge branch 'develop' into case-2953
case 2953 - Feed aggregator font size fix.
case 2953 - CR fix.
Merge branch 'case-2953' into develop