Keyword: 26backport
Description: Backport 3.0 feature from 2.6