Add a capability for it.
Merge bug26113
stable to default