merge Integration changes