PR Build: #315 (1.988) - 21364: Improves entity persistence: works as single transactional files as well as performance improvements, MINOR

PR Build: #315 (1.988) - 21364: Improves entity persistence: works as single transactional files as well as performance improvements, MINOR #988