Merging latest changes (includes JS work)