Merge branch 'sa3#88' into 'rel16'

Changes agreed at SA88e

See merge request !21
3 jobs from v16.3.0 in 16 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Check Schemas
passed #9327
checkASN1

00:00:06

passed #9329
checkXSD

00:00:05

passed #9328
allowed to fail
lintASN1

00:00:05