DO NOT MERGE. Use resolved path for both checking and opening. am: 8a2e551874 am: e13f6fa9b6 am: 8e6c809370  -s ours am: 46a4c650bb am: 1aaf16b00e  -s ours
am: 47784d61cf

* commit '47784d61cf756509e5002b0938af03ce009fd854':
  DO NOT MERGE. Use resolved path for both checking and opening.