Shades latest
Merge pull request #3736 from leoj3n/shades-latest

Shades latest