Cherry-picking Shadows from @alexeypegov

As it was said, @alexeypegov. As it was said.