I will add a test for this in the fix for INT-3186

Also, please add the JIRA to the commit comment while merging; thanks.