CON-1821: Use extend function