annotations
(cherry picked from commit 9ecc461)