Merge pull request #2689 from benthecarman/no-std-offer-expire