Backlog/112 (into release/iotplatform-v1)

"Twin" PR of #116 

(In this case, we have applied the merging order to release/iotplatform-v1 and develop in the oposite way, given that we miss the branches in the first PR).