Sync with 0.34, assuming to be correct