Merge branch 'hotfix/0.5.7'
Fix bug that causes clear_cache handler to stop when loading the list of disciplines
Merge branch 'hotfix/0.5.8' into develop