Adding extendObject to transient list
Merge branch 'develop'