Merge pull request #9833 from MrPetovan/task/9719-frio-block-author-more