Pull updates from ruih/master. We need these updates for trick modes to work property for CVP2 plugfest36 effort.

Pull updates from ruih/master. We need these updates for trick modes to work property for CVP2 plugfest36 effort.