Merge branch 'bug/JAL-2507_rnasecstrstockholm' into develop