Merge branch 'fix_1523_1' into '7.4.0'

Fix for #1523 - Optimization of record label computation.

**Areas validated**

* User CRUD (both admin and non-admin)
* Create or Update records from workflows
* CRUD from APIs

See merge request !756