Fix invalid order of oldest note
Merge branch 'develop'