Since I'm here, make some cleaning and add some explicit dependencies. PR: 235951 Submitted by: romain