LPS-37266

Hey Iliyan,

Your js changes are isolated in commit 5cb0387. Please take a look and forward it to Brian