Merge "Blueprint controller loopback fix"