Updates and fixes based on Integration Toolkit 9.0.0.2