Merge "Work around APCu memory corruption bug"