Merge "extra loopback cleanup" into stable/fraser