port the changes from [3155] to Kamikaze