Merge remote-tracking branch 'origin/fix-comparison-page' into fix-comparison-page