Checking in all changes to match the ISF tools revision 3