RAZ-2820: SMSB Requirements/Merged
- Tweak for expiry date check