E2 changes to fix the E2setup response issue