Merge "Fix positioning in path fallback case" into nyc-dev