am 618907e1: Merge "[ML7] Have multiple DictionaryGroup instances in facilitator"

* commit '618907e1f15c98a2cd46459a097663aeb145467d':
  [ML7] Have multiple DictionaryGroup instances in facilitator