Merge fixes and changes
offers-link fix