AG|PM: video - add more bug comments
Merge remote-tracking branch 'origin/master'