Merge branch 'load_comments_performance'