keep in sync with community edition