Merge pull request #14274 from seamuslee001/protected_fields_dao