updates renderer view
renderer view changes
Integrate renderer
Fix rewind/forward
Merge remote-tracking branch 'upstream/master'