Merge branch 'meeting/LI#55e' into 'master'

Meeting/li#55e

See merge request !18
1 job for standards/ts_103120/1.7.1