Merge "fix(intel): software workaround for bridge timeout" into integration