#1088 - Add annotation param for production filtering
(cherry picked from commit c9279bb)