Merge "Decouple downgrade and optimization processes."