Feature/app session See merge request !1016
Feature/app session See merge request !1015
Release/1019 See merge request !1014
ctx See merge request !1013
