Merge branch 'usrsbn-master-patch-13782' into 'master'

Update TOC creation

See merge request !3
2 jobs for master in 2 minutes and 20 seconds (queued for 3 seconds)