Fix bug around OptionsStore grace behavior
Fix bug around OptionsStore grace behavior

ifduyue/sentry,beeftornado/sentry,BuildingLink/sentry,jean/sentry,fotinakis/sentry,fotinakis/sentry,JamesMura/sentry,zenefits/sentry,ifduyue/sentry,gencer/sentry,jean/sentry,jean/sentry,zenefits/sentry,JamesMura/sentry,beeftornado/sentry,nicholasserra/sentry,JackDanger/sentry,mitsuhiko/sentry,ifduyue/sentry,JamesMura/sentry,BuildingLink/sentry,daevaorn/sentry,beeftornado/sentry,gencer/sentry,alexm92/sentry,zenefits/sentry,fotinakis/sentry,nicholasserra/sentry,gencer/sentry,mvaled/sentry,alexm92/sentry,looker/sentry,ifduyue/sentry,JackDanger/sentry,looker/sentry,mvaled/sentry,mvaled/sentry,jean/sentry,gencer/sentry,looker/sentry,mitsuhiko/sentry,BuildingLink/sentry,daevaorn/sentry,zenefits/sentry,daevaorn/sentry,fotinakis/sentry,JamesMura/sentry,gencer/sentry,looker/sentry,mvaled/sentry,JackDanger/sentry,mvaled/sentry,zenefits/sentry,looker/sentry,alexm92/sentry,ifduyue/sentry,nicholasserra/sentry,daevaorn/sentry,BuildingLink/sentry,BuildingLink/sentry,JamesMura/sentry,mvaled/sentry,jean/sentry