Update SpringXD to M7