EF Fixes
Merge commit '6772b628c45b43ee419098f61f5183477d6434df'