Merge pull request #13051 from mlutfy/customvalue-checkbox-display