backport 3.2 operational enumerator updates #3246