Fixes #20622 - puppet import does not refresh all statuses
(cherry picked from commit be6706162e9705611827aa0a8e875a9f3175d2e9)
Fixes #20622 - puppet import does not refresh all statuses
(cherry picked from commit be6706162e9705611827aa0a8e875a9f3175d2e9)