Bring redesign branch up-to-date with the latest goodies from XML Storage