[fixes #47666699 #47666903 #47666795 #47877385] Checking on fixes and remove unused imports.