Merge branch 'bug24582'