sync the beast with 3.14.24 upstream release