Ashraf G, I had the same problem as you had. And your solution of setting the properties for the exended entities to false as you outlined solved it for me as well. Thanks for persisting with this one.
Have you run into any adverse effects of setting these properties persistence to false? Has this fix worked for you in the longer term?
Thanks
Jason