updated with spectra fixes detailed in eso ticket PROP050011
commit before merging into marshall