diff --git a/scripts/nightly/nightly-build.sh b/scripts/nightly/nightly-build.sh
index 5db64b596c4..a37ee0cd8fc 100644
--- a/scripts/nightly/nightly-build.sh
+++ b/scripts/nightly/nightly-build.sh
@@ -5,10 +5,10 @@ cd azure-cli
 
 # modify versions of the packages (__init__.py and setup.py files)
 for initfile in src/azure-cli/azure/cli/__init__.py src/azure-cli-core/azure/cli/core/__init__.py; \
-    do sed -i 's/^__version__ = [\x22\x27]\(.*\)[\x22\x27]/__version__ = \x27\1+1.dev'$(date +%Y%m%d)'\x27/' $initfile; \
+    do sed -i 's/^__version__ = [\x22\x27]\(.*\)+dev[\x22\x27]/__version__ = \x27\1+1.dev'$(date +%Y%m%d)'\x27/' $initfile; \
     done;
 for d in src/azure-cli/ src/azure-cli-core/ src/azure-cli-nspkg/ src/command_modules/azure-cli-*/; \
-    do sed -i 's/^VERSION = [\x22\x27]\(.*\)[\x22\x27]/VERSION = \x27\1+1.dev'$(date +%Y%m%d)'\x27/' $d/setup.py; \
+    do sed -i 's/^VERSION = [\x22\x27]\(.*\)+dev[\x22\x27]/VERSION = \x27\1+1.dev'$(date +%Y%m%d)'\x27/' $d/setup.py; \
     done;
 
 pip install azure-storage==0.33.0
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index 2922f77f6f2..69c5797ff2b 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -5,4 +5,4 @@
 import pkg_resources
 pkg_resources.declare_namespace(__name__)
 
-__version__ = "0.1.0b10"
+__version__ = "0.1.0b10+dev"
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index 9b99808ba8d..eaf657f2ef7 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = "0.1.0b10"
+VERSION = "0.1.0b10+dev"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
diff --git a/src/azure-cli/azure/cli/__init__.py b/src/azure-cli/azure/cli/__init__.py
index 28924d4c30c..5f34ab3e5c2 100644
--- a/src/azure-cli/azure/cli/__init__.py
+++ b/src/azure-cli/azure/cli/__init__.py
@@ -11,4 +11,4 @@
 pkg_resources.declare_namespace(__name__)
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "0.1.0b10"
+__version__ = "0.1.0b10+dev"
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index bb33fd8f57e..eaa77ab8b51 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = "0.1.0b10"
+VERSION = "0.1.0b10+dev"
 
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
diff --git a/src/command_modules/azure-cli-acr/setup.py b/src/command_modules/azure-cli-acr/setup.py
index f73c729c199..db32d424a65 100644
--- a/src/command_modules/azure-cli-acr/setup.py
+++ b/src/command_modules/azure-cli-acr/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-acs/setup.py b/src/command_modules/azure-cli-acs/setup.py
index 85df1c9f8ac..0ce39dfd090 100644
--- a/src/command_modules/azure-cli-acs/setup.py
+++ b/src/command_modules/azure-cli-acs/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-appservice/setup.py b/src/command_modules/azure-cli-appservice/setup.py
index 8829cc678f9..97808603778 100644
--- a/src/command_modules/azure-cli-appservice/setup.py
+++ b/src/command_modules/azure-cli-appservice/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-cloud/setup.py b/src/command_modules/azure-cli-cloud/setup.py
index 5f59c2e466a..0c681081280 100644
--- a/src/command_modules/azure-cli-cloud/setup.py
+++ b/src/command_modules/azure-cli-cloud/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
index c067490a889..14a6b2c6503 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
@@ -14,8 +14,15 @@
 CLI_PACKAGE_NAME = 'azure-cli'
 COMPONENT_PREFIX = 'azure-cli-'
 
+def _verify_not_dev():
+    from azure.cli.core import __version__ as core_version
+    dev_version = core_version.endswith('+dev')
+    if dev_version:
+        raise CLIError('This operation is not available in the developer version of the CLI.')
+
 def list_components():
     """ List the installed components """
+    _verify_not_dev()
     import pip
     return sorted([{'name': dist.key.replace(COMPONENT_PREFIX, ''), 'version': dist.version}
                    for dist in pip.get_installed_distributions(local_only=True)
@@ -23,6 +30,7 @@ def list_components():
 
 def list_available_components():
     """ List publicly available components that can be installed """
+    _verify_not_dev()
     import pip
     available_components = []
     installed_component_names = [dist.key.replace(COMPONENT_PREFIX, '') \
@@ -51,6 +59,7 @@ def list_available_components():
 
 def remove(component_name):
     """ Remove a component """
+    _verify_not_dev()
     if component_name in ['nspkg', 'core']:
         raise CLIError("This component cannot be removed, it is required for the CLI to function.")
     import pip
@@ -103,6 +112,7 @@ def _install_or_update(package_list, link, private, pre):
 
 def update(private=False, pre=False, link=None, additional_components=None):
     """ Update the CLI and all installed components """
+    _verify_not_dev()
     import pip
     # Update the CLI itself
     package_list = [CLI_PACKAGE_NAME]
diff --git a/src/command_modules/azure-cli-component/setup.py b/src/command_modules/azure-cli-component/setup.py
index 6890ca34964..13bcee747c5 100644
--- a/src/command_modules/azure-cli-component/setup.py
+++ b/src/command_modules/azure-cli-component/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-configure/setup.py b/src/command_modules/azure-cli-configure/setup.py
index 7f4a486388d..e9ba7a4afa6 100644
--- a/src/command_modules/azure-cli-configure/setup.py
+++ b/src/command_modules/azure-cli-configure/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-container/setup.py b/src/command_modules/azure-cli-container/setup.py
index 1800036f1ee..b3e8a1f396a 100644
--- a/src/command_modules/azure-cli-container/setup.py
+++ b/src/command_modules/azure-cli-container/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-context/setup.py b/src/command_modules/azure-cli-context/setup.py
index db24d5a7ae9..6fe5d6718ee 100644
--- a/src/command_modules/azure-cli-context/setup.py
+++ b/src/command_modules/azure-cli-context/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-feedback/setup.py b/src/command_modules/azure-cli-feedback/setup.py
index b69ccf14f6d..da7556a89e6 100644
--- a/src/command_modules/azure-cli-feedback/setup.py
+++ b/src/command_modules/azure-cli-feedback/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-iot/setup.py b/src/command_modules/azure-cli-iot/setup.py
index f71172e7dd3..ee289f9ac5a 100644
--- a/src/command_modules/azure-cli-iot/setup.py
+++ b/src/command_modules/azure-cli-iot/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-keyvault/setup.py b/src/command_modules/azure-cli-keyvault/setup.py
index 9d9d5cf97fb..c0e81fc4e06 100644
--- a/src/command_modules/azure-cli-keyvault/setup.py
+++ b/src/command_modules/azure-cli-keyvault/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-network/setup.py b/src/command_modules/azure-cli-network/setup.py
index 0bda3598b6d..8c406c0074a 100644
--- a/src/command_modules/azure-cli-network/setup.py
+++ b/src/command_modules/azure-cli-network/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-profile/setup.py b/src/command_modules/azure-cli-profile/setup.py
index 8b2abff4697..0c376777d69 100644
--- a/src/command_modules/azure-cli-profile/setup.py
+++ b/src/command_modules/azure-cli-profile/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-redis/setup.py b/src/command_modules/azure-cli-redis/setup.py
index 20effa9f4bf..b030bed3eb1 100644
--- a/src/command_modules/azure-cli-redis/setup.py
+++ b/src/command_modules/azure-cli-redis/setup.py
@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-resource/setup.py b/src/command_modules/azure-cli-resource/setup.py
index 73bd48cae6b..5951bfaab08 100644
--- a/src/command_modules/azure-cli-resource/setup.py
+++ b/src/command_modules/azure-cli-resource/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-role/setup.py b/src/command_modules/azure-cli-role/setup.py
index 116b8db617c..4ae53fbb122 100644
--- a/src/command_modules/azure-cli-role/setup.py
+++ b/src/command_modules/azure-cli-role/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-storage/setup.py b/src/command_modules/azure-cli-storage/setup.py
index c094e36174f..01e41d3790f 100644
--- a/src/command_modules/azure-cli-storage/setup.py
+++ b/src/command_modules/azure-cli-storage/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-taskhelp/setup.py b/src/command_modules/azure-cli-taskhelp/setup.py
index 082ce2a455f..f095032d9d2 100644
--- a/src/command_modules/azure-cli-taskhelp/setup.py
+++ b/src/command_modules/azure-cli-taskhelp/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-vm/setup.py b/src/command_modules/azure-cli-vm/setup.py
index 70cb500a656..b506938b51c 100644
--- a/src/command_modules/azure-cli-vm/setup.py
+++ b/src/command_modules/azure-cli-vm/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = '0.1.0b10'
+VERSION = '0.1.0b10+dev'
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',