Merge "Fix the MacOS build of incremental*"