Merge pull request #16649 from alifrumin/copyState3