Merge branch 'rebalance-listener' into stored-state