AS7-5651 Add annotation support to global-modules

Replaces #4304