Quoting myself from the spoiler thread, just to set your expectations on when you can expect to do the final upgrade for Moonveil or WOA: