Some refactoring.
Refactoring to abstract RenderingContext.
I think this is a bug...
Merge branch 'streaming/refactoring' into feature/streaming