*Experimental* optimization Former-commit-id: 4dee4905d59739b3ec062ef283d4b7561160e21d
Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9