Merge branch 'bugs/JAL-2606_broken_jabaws22_IADependency' into develop