sync with 0.34+