ALM-379 reduced number of calls of auto-load function