Merge pull request #1959 from tmchow/osc/1958-ignore-parent