Merge "Fix issue where line alpha would be overridden" into tm-dev