Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev