changeset_bf-skiptest.diff
