(cherry picked from commit a51c2f08c8699e4367ff1b95028662ce22f88b9d)

# Conflicts:
#	common/utils/T/tracer/extract.c
#	common/utils/T/tracer/extract_input_subframe.c
#	common/utils/T/tracer/extract_output_subframe.c
#	common/utils/T/tracer/hacks/dump_nack_signal.c
#	common/utils/T/tracer/hacks/multi-rru-clean.c
#	common/utils/T/tracer/record.c
#	common/utils/T/tracer/to_vcd.c
#	common/utils/itti_analyzer/libparser/xml_parse.c
#	common/utils/itti_analyzer/libui/ui_filters.c
#	common/utils/itti_analyzer/libui/ui_notifications.c
#	common/utils/msc/msc.c
#	nfapi/open-nFAPI/vnf/src/vnf_p7.c
#	nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
#	openair1/PHY/CODING/3gpplte_turbo_decoder_avx2_16bit.c
#	openair1/PHY/CODING/3gpplte_turbo_decoder_sse_16bit.c
#	openair1/PHY/LTE_ESTIMATION/bf_freq_domain_filters.m
#	openair1/PHY/LTE_ESTIMATION/freq_domain_filters.m
#	openair1/PHY/LTE_REFSIG/gen_mod_table.m
#	openair1/PHY/LTE_REFSIG/primary_synch.m
#	openair1/PHY/TOOLS/lte_dfts.c
#	openair1/PHY/TOOLS/lte_enb_scope.c
#	openair1/PHY/TOOLS/lte_ue_scope.c
#	openair1/PHY/TOOLS/smbv.c
#	openair1/SIMULATION/LTE_PHY/Abstraction/Training/polyfit_beta_training.m
#	openair1/SIMULATION/LTE_PHY/Abstraction/Training/training_abstraction.m
#	openair1/SIMULATION/LTE_PHY/dlsim.c
#	openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
#	openair1/SIMULATION/LTE_PHY/dlsim_tm7.c
#	openair1/SIMULATION/LTE_PHY/mat2wv.m
#	openair1/SIMULATION/LTE_PHY/mbmssim.c
#	openair1/SIMULATION/LTE_PHY/pbchsim.c
#	openair1/SIMULATION/LTE_PHY/scansim.c
#	openair1/SIMULATION/LTE_PHY/syncsim.c
#	openair1/SIMULATION/LTE_PHY/ulsim.c
#	openair1/SIMULATION/TOOLS/corr_mat.m
#	openair3/TEST/EPC_TEST/generate_scenario.c
#	openair3/TEST/EPC_TEST/play_scenario_parse.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/RT/USER/lte-ue.c

(cherry picked from commit 63e04f586948f15f125ad464d228fc19ceae7559)

(cherry picked from commit 04c5431468c9102dd625a73d9e5219b40b638fe3)
(cherry picked from commit 17880778c848406e562f98c20f7b7a6428502279)
(cherry picked from commit a26f44c197e854dd4261267a3695932392f09265)

(cherry picked from commit 57caca9ba87fda3f73aa30d86f4af01a6062224c)

(cherry picked from commit 7db6a2b3b812cf3319d8a97ba44f9764b0950ca1)

(cherry picked from commit 3e6d468b1938a2bf006e7bca8a7249d12ff64745)

# Conflicts:
#	openair2/RRC/LTE/rrc_eNB.c

(cherry picked from commit 7138f92b0b153bb94a821b9cdc06ed4908a35e5a)

(cherry picked from commit 4868cbbec45450277707f069b9f5603926221fe7)

(cherry picked from commit 0b2c605b73e7daaffeccfff151708a48f7150663)

(cherry picked from commit 9f6e9ee61bbcbe827efcc5ca101d0afd8c34e1fd)

(cherry picked from commit 6d5a40bd826de160ddf55599f61d1359cfba3fa4)

# Conflicts:
#	openair1/PHY/LTE_TRANSPORT/pucch.c

(cherry picked from commit 5482843b9a9dfd25abe74afb04a40c117da3bac4)

(cherry picked from commit 78852a03f3c5581b53a88929f9c1784fc60c5376)

(cherry picked from commit 3bed7dc69db8dc43b28b62553f12834efbca349b)

(cherry picked from commit b54fe7e4e3b878e1293dfaf1b1b89d0f1f8b305f)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_primitives.c

(cherry picked from commit c4417387a19dd3f51e8a972ada8176898f348a76)

# Conflicts:
#	openair2/LAYER2/RLC/rlc.c

(cherry picked from commit a0df8e9f7303a5993b8e6a3e84084cc5c73efba6)

(cherry picked from commit b89b36ea9693b4053e3410bda1cc58e48266ef44)

(cherry picked from commit 51634853671e07ef3013bc44ec79fc38c0646147)

(cherry picked from commit c388479453ab82d5c8721ace7ea9f90a0137cae5)

(cherry picked from commit 72a4248ea366919604f4e56b3d8a2c7030cd2d16)

(cherry picked from commit f28d8e1ad8e79508f8c8f777dc0979a5bc82f7ea)

(cherry picked from commit 0622f7d40523e39334708ce4b9b0ee68e8fb2bf1)

(cherry picked from commit 9f170c0e55b770cb48d6ae0640e5ae647be21c3c)

# Conflicts:
#	targets/RT/USER/lte-enb.c
#	targets/RT/USER/lte-ru.c

#       openair2/RRC/LTE/rrc_eNB.c
#       openair2/RRC/LTE/rrc_eNB_GTPV1U.c

(cherry picked from commit abe06ef1bd58efe3e7147d273cc127b87aa9dc3b)

(cherry picked from commit 792e77697dc250d751276acba29365e57ad92abc)

(cherry picked from commit 6e342c8f55f3af86c127753ea4b5635d381216e3)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c

(cherry picked from commit cdc5100d250883e90472d6de605a790a3c80052d)

(cherry picked from commit de93d8f0aa9e6d7380bd159901a41aa36f257298)

# Conflicts:
#	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync_eNB.c
#	openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c

(cherry picked from commit 120ea0950e1f52c1c5dd1d0dd4f7080e66d7ee93)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_primitives.c

(cherry picked from commit 6f3d14e74663e75f2eaf3cd1c1348d5d028e3379)

# Conflicts:
#	openair1/PHY/defs_eNB.h
#	openair1/SCHED/phy_procedures_lte_eNb.c
#	openair2/ENB_APP/L1_paramdef.h
#	openair2/ENB_APP/enb_config.c

(cherry picked from commit d528bb824d4515a61acaaf2eb35c0c659fc3a6db)

(cherry picked from commit f709e4a765b3ab8461bafcba672bae6b9c3f966f)

(cherry picked from commit 624fe21f52117959940066a6cfc5f8beac70e462)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
#	openair3/S1AP/s1ap_eNB.c

(cherry picked from commit 39850dcfadb37e24ccfe41e0a85a9f2136eeff4a)

(cherry picked from commit aaa4d390fdefc4e8071b80edc90a580907c9dec3)

(cherry picked from commit 519e6628d572c9b6cf8031632d4e22e2f8dc5b93)

(cherry picked from commit 2339972ceaeb75fe18c0b2ae9ea69216dd919668)

# Conflicts:
#	openair2/ENB_APP/enb_config.c
#	openair2/RRC/LTE/rrc_eNB_S1AP.c
#	openair3/S1AP/s1ap_common.h
#	openair3/S1AP/s1ap_eNB.c
#	openair3/S1AP/s1ap_eNB_handlers.c