Issue #2065501 by japerry: Update entity API to 1.2