Merge branch 'Dbfetch_hotfix-JAL-1238' into develop