Merge "Move build fingerprint check outside of main loop"