Merge branch 'StoragePerf' into 'master'

Changes identified in Storage performance testing for legal tag update

See merge request !238
28 jobs for master in 55 minutes and 9 seconds (queued for 7 seconds)