Merge PR #5802 to develop branch, initial merging
Forward #5802
Merge branch 'merge/5802-develop' into develop

* merge/5802-develop:
  Merge PR #5802 to develop branch, initial merging