misc: Merge branch develop into stable for v22.1

Change-Id: Iee0f0de534b5cf76667e99949d46875f7459e81a