Comment 24 for bug 1336207

@Tristan

Thanks for your remind, I update the havana and icehouse patch, it should be OK now.

@Aaron

Thanks for your review.