Merge branch 'feature/JAL-2119_helplinkchecker' into develop