Commit for fixed comment and related video modules issues.