Checkmate

Ref: DCR-089