Updated branch (disabled Fuji temporarily).