Cherry picked fe1ec