[Bug: 21.5.23 build]