ref: refs/heads/issue_3393
