reduce resumetime
Merge branch 'xstools'