Issue #2015551 - Fix for broken dev mode support switch (2)