s01-s02: commit before merging with the DB branch