Merge "Add precondition checks"