Updates to CF-855.11