MSINM-107: Consolidate JSON functionality