fixing perf app for dynamic component def
Merging origin/dval/master-pending-perf-def-fix into master