second diff
Merge remote-tracking branch 'origin/#2508-offer-actions-traff'