ONLINE-2826-add-tuple-dict