git merge slimbus: bring franco's github