Merge "Fix check for existence of parent" into nyc-mr1-dev