FORGE-730: annotation order enhancements