Recursive fallback to dict
merged master into this branch