sync omicron to commit 22543b3f195b85dbea46e5d6fa191f294277585b