Merge pull request #13916 from alifrumin/caserelstocore