WCM-21 Fix startup issues and document the temporary solution