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 am: ae7d56abe4 am: 224c8b5d4e  -s ours
am: e33446d2dc

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