Ok, done.
CAAT-2227- https://contentanalyst.atlassian.net/browse/CAAT-2227