Merge branch 'StoragePerf' into 'master'

Changes identified in Storage performance testing for legal tag update

See merge request !238
2 jobs for !246 with master in 42 minutes and 57 seconds (queued for 5 seconds)
latest merge request