sync with ad94908e
in progress
sync with c163876c