Improve eager loading for elective blocks
Improve eager loading for elective blocks

Change-Id: I9ba5f07278d28db2ab41cc0577e477c244dfae42

Opensoftware/USI-Core,Opensoftware/USI-Core,Opensoftware/USI-Core