Merge "Separate FINE and COARSE location ops"