merge pomelo update

merge pomelo update