[WIP] rebase to 3.0.31

Signed-off-by: lucize <lucian.cristian@gmail.com>
Signed-off-by: dtrail <mnl.manz@gmail.com>