Merge "clamp & round alpha" into lmp-dev