AG-3561: initial