session scope is not available on internal calls thus wraped calls
Merge branch 'develop'