Fix for recent interface change to ElementPrepareAwareInterface
Merge pull request #3548 from cgmartin/fix/prepare-interface

[develop] Fix for fatal errors from ElementPrepareAwareInterface change