STS-3659 - "before" and "after" support