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'