:memo::bug: Fix bugs in session-4
:memo::bug: Fix bugs in session-4

niazangels/CADL,padipadou/CADL,alvaroing12/CADL,pkmital/CADL,niazangels/CADL,goddoe/CADL,pkmital/CADL,padipadou/CADL,alvaroing12/CADL,goddoe/CADL