Merge pull request #405 from gsn/master

Merged from beta.
23979 - Mariano's - Tastemaker Giuseppe Tentori: 1 big commit
Merge pull request #406 from 375/monday1027

23979 - Mariano's - Tastemaker Giuseppe Tentori: 1 big commit
Merge pull request #407 from gsn/monday1027

Merged from monday1027.