Merge "Fix volantis boot."