Merge "Move session contains apex/apk logic inside session object"