Merge release/3.12.0 into develop - #3637

• All applicable files are owned properly
  _{Digest: 71c9c53}
• All required reviewers have approved
  _{Digest: b55752c}

if this seems incorrect, you can retrigger the evaluation of the MergeGate by clicking on this link