[46178/46287] Fixed multiple critical issues