Merge branch 'compare' into production
Merge branch 'debug' into production