Merge remote-tracking branch 'public/bug15515_025'