Update to 248f1255a26a61d9614d39ed438958212c11817d