Merge branch 'case-3388' into develop
Merge remote-tracking branch 'origin/develop'
Release: v1.16
Merge branch 'master' into develop
Case 3362 - Added session cache.
Merge branch 'case-3362' into develop

* case-3362:
  Case 3362 - Added session cache.
Merge branch 'develop'
Release: v1.18
Merge branch 'master' into develop
case 3388 - Replace entity when not found in well.