merged JS minor