UC-1806 - More references to legacy ACD