[46264/46465] Fixed multiple issues