installer: sync with branch