merge with current ci-bonfire source