commit_2605-0630