Issue #2299677 by er.pushpinderrana, gauravkhambhala | jhodgdon: Fix up annotation-related topics a bit.