Merge branch 'bugs/JAL-2065' into develop