(cherry picked from commit 3b61302944ada2b6cb37a54a45476651b55a6a94)

(cherry picked from commit 71f2905c71d97530f45be3daf6ba167775abe827)

(cherry picked from commit d62aa7ca5b42741dcd15c00f38adaad42b5cf342)

(cherry picked from commit e9917cb9bd43f9e280b78a5c6cfbb2ed74b6e058)

# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c

(cherry picked from commit 145d2c08e057b8cedfa3e2fc459cd86aa224c185)

# Conflicts:
#	targets/RT/USER/lte-softmodem.c

(cherry picked from commit 6d611c75b14bec664b6cdb11da308cea08c87047)

(cherry picked from commit 41bddc6a80b4ae17c41a807da49f617fe90cc4e9)

(cherry picked from commit 8c19fc121f62e929c8a2edfff313d81cca870a61)

(cherry picked from commit 5116c11ac3800c9a99b0624620b9ebbd6be42e26)

(cherry picked from commit 6a0584ae989c6e1a336125338a17db79d3764073)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_RA.c
#	openair2/LAYER2/MAC/rar_tools.c
#	openair2/RRC/LTE/MESSAGES/asn1_msg.c

(cherry picked from commit 9856e937c8ea6c1584d9c8917f2ca72cec8bc896)

(cherry picked from commit edd9d0e8237dad97901bee1f6bfc6a40af2246d0)

(cherry picked from commit 9e300b225d5004fd93bf320fad8096006e56006f)

(cherry picked from commit ca225958100d814818b90cf1bdd4180edfdbb8b6)

(cherry picked from commit 5a5afee71f77856875a182692e5956b3fa32f10d)

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

(cherry picked from commit 8186060d940d1c47a7f8309382173c24365dfbab)

(cherry picked from commit 7e8b13bbdfa2656fbdc817a8e5dc00be0b3b4e06)
(cherry picked from commit d71a1f82b3ecfad13df8e15d5e23756fa0c965ec)

(cherry picked from commit b1be92c272f711c9e4402656246c78adf448968e)

(cherry picked from commit 4c664da7d2ca85f60902f0ec929abe8d5c11bae0)

(cherry picked from commit 89388420dd077922fcfd0e3f6e18c2f8a1d1343d)

(cherry picked from commit 8cb7279f98664fdd6cd1200ef5d59c0ddebdb785)

(cherry picked from commit 175c59ae3aedf612777cd1c8c88b6d6f254b9334)

(cherry picked from commit f6b51079021347c19d528200f04d7cdba1dde0e5)

(cherry picked from commit 412f15df9171af5b1f4766854e292b09370a1b3e)
(cherry picked from commit 55b6d866d3c1ebd3095a44661e4e435f15d3cd7f)

(cherry picked from commit 92af97ff22b1a244db29a01e32feb58c237994b2)

(cherry picked from commit cd8c6095bc3f13a60a6710a690a068795c5a77b2)

(cherry picked from commit bea66ef41df2b1e2b04877090b92c7740f9070c1)

(cherry picked from commit d3a5c0e805d4e46e764ae3bb8cafc891d6dc5225)

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

(cherry picked from commit d6ae90be8937e8ed7d7965475c8d20ea2f2c878c)