Deleted VideoMessage because it is not needed.
Merge remote-tracking branch 'origin/master'