Merge from powergrid/wire_auth