Merge branch 'master' into develop
Bugfix: preserve filter by 'bill_id' when sorting the list view.
Merge branch 'develop'