Cherry-picked from the branch operator_spectra for early adoption.
operator_spectra
This will create a new commit in order to revert the existing changes.
