Merge "Fixed handling of blockUninstall setting" into nyc-dev