Merge "Fix issues associated with hold failure"