Case 3972 - Fixes for easyDDB.
Merge branch 'case-3972' into develop

* case-3972:
  Case 3972 - Fixes for easyDDB.