Upgrade Safe Customizations - 8/2/18