commit: Merge with 21.5 trunk.