Issue #2300751 by dcmul: Made public entity properties protected.