Release5.2

merge release 5.2