Merge "Tunnel showing wrong state in scale setups"