Merge branch 'bug24584'