am ddee4914: Merge "Move dictionary facilitator handling."

* commit 'ddee491450bd4447d1dcf102f472fe7038cbfb1d':
  Move dictionary facilitator handling.