Preserve < and > in conditions.
Merge branch 'release/3.0.7'