Fix reload
Work around for Wildfly session tracking bug
Merge 'includes' and 'reload fix