Merge commit 'fa50db79c474083ad5ae29b1b7f60b25ba6ba579' into r300080