Merge branch 'sbatten/zindex' into main