XS build - 3.0.6