mirari clean and autoswitch feature

See CHANGES