Merge "Skip unnecessary measurements when possible"