[#75444412] first pass for this feature