LPS-41380
LPS-41415 Sastisfy Hibernate without using flush
LPS-41415 Use protected methods