Merge "Make ArcMotion material spec compliant"