LPS-32637

LPS-32637 Please make javascript review for this. Source code format did cause errors and those are rollbacked and fixed with separate commits