Merge "[Shadows] Add support for shadow attributes (7/n)"