optimize, fix possible exception
resolve parameter names for meta-runner usages. Navigation does not work
Merge remote-tracking branch 'github/master'