IDE-1196 work-in-progress