Merge "[Feature][task-view-306]merge P56U08(patch6) version"