I propose backporting commit 49eefca5d5564a5d9459bd38e314947a8579c9b4 from develop to the current release branch.
This fix has been on develop since Dec 5 with no issues. It is critical because without it, hang in gii/rebalance is possible when persistent AEQ is enabled. This issue is believed to have been present since 1.10.0.
