Merge pull request #7211 from lalinsky/vidme-suspended