Change resolveStrategy to OWNER_FIRST to support script bindings