TODO meld into intial checkpoint (EE6 compat: need WEB-INF/beans.xml)