Merge issue-586-engine branch back

git-svn-id: https://svn.mcs.anl.gov/repos/exm/sfw/lb/trunk@12726 dc4e9af1-7f46-4ead-bba6-71afc04862de