Hand merge @religero #8930 with Lint Fixes