commit_08/12/14