Merge pull request #8504 from MrPetovan/task/8489-ap-cache-cors-headers