Synced to klvm changes.