Fallback to empty dict...

This fixes #13838.
Merge branch 'bug2' into develop