commit from omicron build