Fix timestamp and add loading indicator to different file
Merge remote-tracking branch 'origin/development' into development