Merge the current master into the right management prototype
requested to merge merge-master-into-67-implement-a-right-management-prototype into 67-implement-a-right-management-prototyp
The auto merge features removed quite a lot of our logic to set & update user ids (created_by, modified_by).