Release 18 - Adaptation for newer XVM releases