Merge remote-tracking branch 'public/bug4591'