Merge branch 'feature/JAL-4307_hetatm_showhide' into develop