Merge remote branch 'origin/new/bug6554_reverts'