Update from base fork of example-branches