enhancement/420/disable-current-restore