Merge in latest changes from main Interfake repository