Comments sorting and timescale groundwork
Merge remote-tracking branch 'origin/master'