[esb-dev] Build system changes