v7.31 fixes with last release