Merge branch 'patch/JAL-2698_blockingAutoAssociateDiaog' into develop