sync with oslo review