working on js issues, refs #7696
Merge branch 'dev' into test
Merge branch 'test' into prod