Merge "use LOCAL_PATH properly"