[WIP] merge to 3.0.31

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>