PAHMA-1085, UCBG-379: incremental improvements to load scripts