Task #39891: merged with mainline