[HOLD] Weibelt/integ upstream