Also adding EMBPD00156575 fix to this branch for time efficiency.  This is copied from the Rho fix for the same (EMBPD00156561)