This seems like a separate issue, ISPN-2173. Shouldn't it be separated into a different commit with the ISPN-2173... message?