Impl all, adapt bundle
Merge origin/master