Merge branch 'bug/JAL-4313-make-visible-annot-fix' into JAL-1601-direct-jpred4-rest...