Issue #2399641: Add entity module to the make file now that it's a dependency
Merge branch 'Issue-2399641' into develop