CAAERS-6364- combine Javascripts
Merge remote-tracking branch 'origin/master'