Merge "Minimal change to remove development settings." into sc-dev