Merge "Fix incremental installation"