#11446: merge with 3.1.