Bugfix for Metrics menu rendering on client charting page
Merge branch 'diff-support' into future