Merged with upstream and added WEB UI script