commit_0506-0616