Merge "Add a variable detecting illegal unbinding."