Merge "Fix Absolute Path to list with Integer/String key"