Merge pull request #8269 from MrPetovan/bug/frio-more-actions