#7647 - Enable escaping_strategy (IN PROGRESS)