Merge "bugfix:fix all generic test cases in grafana"