Merge remote branch 'origin/bug_306_sort_by_date' into experimental