optimization
Merge branch 'master' into beta
extracted InputStreamHolder interface
Merge branch 'master' into beta