Merge remote-tracking branch 'origin/add-mac_MainConfig-to-RRCConnectionSetup' into enhancement-ltem

Conflicts:
	cmake_targets/CMakeLists.txt