Updating w/ latest change from upstream dev branch