some feature in the release5.3

merge release5.3 back