Merge "Handle the new location for LTP"