[esb-dev] Code freeze