remove js errors, refs #8082
Merge branch 'dev' into test