FTS-96: Option optimizer is deprecated