This fix has been identified that it will introduce another lock issue, please consider to backport these patches along with it: 210bd104c6acd31c3c6b8b075b3f12d4a9f6b60d 22a1e7783e173ab3d86018eb590107d68df46c11