Add SuperDevMode support

(cherry picked from commit 747b264b33a089d2ec4e0792e193463da5225641)