PPP-349 changes to make the hide annotation more generic