Merge "Client support force extend share with v2.64"