[FUEL-777] merge remaining modules