Moving changes.
Merging AUTO-00-00-00-0007 into master.
Update.xml regenerated.