Sprint R5 - hardening and CEF

Fixing RELOAD-171