The attached patch publicly defines freedink-engine and freedink-data. This resolves many of the issues described in #43061. This patch, combined with patch #43193(sent earlier today), can close #43061. -Jesse