ref: refs/heads/issue407
