Merge remote-tracking branch 'upstream/example' into example
Merge branch 'example' into ext-functional-test