SES-2051 : WIP: Make Context an Optional<Resource>