Merge branch 'testfix/JAL-2038' into develop