Issue #2904467 by quietone, andyg5000: Plugins do not preserve integer keys when parsing annotations (cherry picked from commit d22493e7)