Merge branch 'lf/bundle-with-tip-wo-message' into maint