sync with upstream, still issue with  FL-2918