updated for xtapi 7.17.23