case 3388 - Replace entity when not found in well.
Merge branch 'case-3388' into develop