Add test case for TBD-1173
Merge remote-tracking branch 'origin/maintenance/5.6'