commit for EF - Paul to branch this to "ef5" branch