Merge "Change variable name BUNDLE_URL->BUNDLE_PATH"