Sprint R5 - hardening and CEF

Fix RELOAD-169