LPS-32637

Please make javascript review for this. Comments from your last review has been checked.