Merge branch 'sa3#88' into 'rel16'

Changes agreed at SA88e

See merge request !21
3 jobs from s3i200319_CR0092 in 16 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Check Schemas
passed #9338
checkASN1

00:00:05

passed #9340
checkXSD

00:00:05

passed #9339
allowed to fail
lintASN1

00:00:05