Update to 2.1.1
PR: 203335 Submitted by: myself Approved by: Hung-Yi Chen (maintainer timeout > 1 month)