add support for fallback keys

Merged Hubert Chathi requested to merge uhoreg/fallback into master

to support MSC2732

Merge request reports