SSF-26 Cross-Site Scripting on Manual Metrics
Automatic merge from branch-5.0

* origin/branch-5.0:
  SSF-26 Cross-Site Scripting on Manual Metrics