moya/staging: links for client-order-fix