Upstream changes
Merge branch 'bbq' into bbq-4.3