Conflicts after 2nd merge with develop resolved. Build of eNB still failing. Haven't tried build of UE yet.
Attach a file by drag & drop or click to upload