close 0.49 branch

merge to master