Merged some switch options into one
Merge commit '3ebc0478b9bc8cc101bd9ba6e39008a9557c7e59' into nonLocal