Release 4.8.2, branches fixed