JAL-1264 show/hide annotations, plus merged changes