Update spirit, fusion from develop.