[Finishes #77895168]
[Finishes #77654226]
resolve in session bug [Finishes #77772078]