Merge remote-tracking branch 'public/bug7816_024'