Merge "Check orientation when retrieving FP location"