Apply commit 2ff57fa7862bc65d753fb616cffa54042b54dd47 to the fuerte code