Merge commit 'refs/changes/29/5829/2' of https://osm.etsi.org/gerrit/osm/RO into lcm