case 3388 - Sanity check.
Merge branch 'case-3388' into develop