Merge "Material EdgeEffect refinements" into lmp-dev