Merge "Fix ELEMENT_PATH logic"