Merge branch 'hotfix/fanvid'
Merge branch 'release/v1.16'
Added 404