Infinite Dismissal

Ref: PSV-072