Merge branch 'ha-pool-offset'