Bugfix 137 uplink fixes

Cédric Rouxrequested to merge
bugfix-137-uplink-fixes into develop

Full testing is required for this one, at least for compilation, uplink and simulators.

Merge request reports