Merge pull request #13948 from MrPetovan/task/12420-frio-remove-legacy-scheme