5 Years Ago
Third attempt to fix entity registry issue (maintaining legacy behaviour)