Merge "Unify extensions parsing behavior"