list view and timeline troubleshooting
Merge branch 'Development' into merging