Merge com js/index do upstream