Merge with PR. Fix debugging warning state