redo commits for I-106274 for cleaner merge

1) fix js formatting
2) redo commits not reconciled in earlier merge
Merge branch 'I-106274' into dev