Merge "Remove shadows from shade"