Merge "Respect style when source is also set" into tm-dev