Merge change 8084

* changes:
  Fix for enabling auto-switch back to alpha mode from symbols.