upstream fixes
repolished the PR (issues+bundle cleaned)