fix enumeration issue

(cherry picked from commit 39922d94d460e05c59ed60d0fe3288f0adf43ad9)
upgrade clarifications

(cherry picked from commit b8f044d1910076a82ad3f73ac72032ccb01cdab2)