I've created a ticket for this - CAAT-2061 (https://contentanalyst.atlassian.net/browse/CAAT-2061)