Merge pull request #9887 from MrPetovan/task/9872-normalize-frontend-api-responses