ja: Follow upstream update