Merge branch 'etsi-apps' into 'master'

The MRS v2.1.1

See merge request !1
2 jobs for master
in 27 seconds, using 0 compute credits, and was queued for 6 seconds