made derivative creation object state aware
Merge pull request #405 from ajstanley/7.x

made derivative creation object state aware