Operator Delay rebase & fixes

Operator Delay

Issue #1060