Merge branch 'bugfix/get_list_return_404' into 'develop'