Added option to avoid unnecessary rebuilds